From: jave <joakim@verona.se>
Date: Mon, 5 Jan 2015 13:12:26 +0000 (+0100)
Subject: Merge branch 'master' into xwidget
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3419
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5a0d5b71d55c73573c331e1e1a1dde9f206966e1;p=emacs.git

Merge branch 'master' into xwidget
---

5a0d5b71d55c73573c331e1e1a1dde9f206966e1